* nsselect.m (Fx_selection_exists_p): Just return Qnil if window system

not initialized.

diff --git a/src/ChangeLog b/src/ChangeLog
index d1e68ad41551013de1fc550b12b4c90779e8afaf..ebb0e1129443831f7ae2c2bfe0a6e75febcde76c 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2014-05-05  Jan Djärv  <jan.h.d@swipnet.se>
+
+       * nsselect.m (Fx_selection_exists_p): Just return Qnil if window system
+       not initialized (Bug#17398).
+
 2014-05-04  Paul Eggert  <eggert@cs.ucla.edu>
 
        Revert recent libpng changes (Bug#17339).

diff --git a/src/nsselect.m b/src/nsselect.m
index f4713cb5e10c3e053740688af76e860d09f7856e..038849c0aed7ef2413c6766c0f65eab307a56ed6 100644 (file)
--- a/src/nsselect.m
+++ b/src/nsselect.m
@@ -429,7 +429,9 @@ On Nextstep, TERMINAL is unused.  */)
   id pb;
   NSArray *types;
 
-  check_window_system (NULL);
+  if (!window_system_available (NULL))
+    return Qnil;
+
   CHECK_SYMBOL (selection);
   if (EQ (selection, Qnil)) selection = QPRIMARY;
   if (EQ (selection, Qt)) selection = QSECONDARY;